cherry-pick
	- [MARKET-159] [CLEANUP] Modified build process so that the plugin version xml injected in marketplace-metadata/marketplace.xml conforms to pentaho code style
	- [CLEANUP] development stage information is now controlled by build.properties
	- [MARKET-159]: publishing stage info for marketplace
	- [CLEANUP] Fixed build variable