Work around another obscure RestController edge case that should raise a 404.

Fixes bug 1311147

Change-Id: I3dd0986c458902b03ed140872fc1938b06e75f4b
Fix a broken scaffold test.

Related to bug 1311629

Change-Id: Ic442457c501d598814f492e7aab4d885bdcf0711
Do not include Content-Type on 204 and 304 status codes

Change-Id: Iec7e5e0a7d5f10bf264a2e8e0a01cdaf2d73fd86
Merge "Fix a broken scaffold test."