Merge pull request #250 from mbenson/master

FORGE-729
FORGE-730: annotation order enhancements
FORGE-436: JavaSource needs a way to parse nested annotations
FORGE-731: API support for nested annotations as annotation element values
FORGE-436: JavaSource needs a way to parse nested annotations
Merge pull request #251 from mbenson/annotationOrder

FORGE-730: annotation order enhancements
Merged mbenson/FORGE-731
Merge pull request #253 from mbenson/FORGE-436

FORGE-436 JavaSource needs a way to parse nested annotations
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into nestedAnnotations