Controller should never return the body into a request 
with OPTIONS enabled
Merge branch 'AEROGEAR-1257'