Minor cleanup and do not reuse annotations on Output Serialization annotations
[bugfix] Make sure to serialize Output annotations correctly for
rest:resource-functions()
Merge pull request #399 from adamretter/bugfix-resource-functions

Bugfix to rest:resource-functions()
Merge remote-tracking branch 'upstream/develop' into develop