Merge pull request #36 from graimundo/master

[SERVDEV-49] - Added some fixes and cleanups
[CLEANUP] - Fixed revision
Merge pull request #37 from marcovala/master

[CLEANUP] - Fixed revision
Merge pull request #38 from graimundo/master

[SERVDEV-49] - Corrected renamed development stage xsd element