fixes #682 - update syntax to work on el6 and el5
Merge pull request #709 from dpetzel/GH682

fixes #682 - update syntax to work on el6 and el5
Merge branch 'development' into development-2-1
wip: Add todos
Merge branch 'feature/resources' into development-2-1
Add maven poms