Update the relevant samples to use the new @SpringBootApplication annotation. Closes gh-1842
Fixes gh-1570 Cherry-picked from 0960908 and 258c6f1