Fixed CPF dependency for CDB-Pentaho

Conflicts:
	cdb-pentaho/src/pt/webdetails/cdb/CdbContentGenerator.java
[MARKET-159]: Added stage information to trunk marketplace info
[MARKET-159]: publishing stage info for marketplace
[MARKET-159]: publishing stage info for marketplace
[MARKET-159] [CLEANUP] Modified build process so that the plugin version xml injected in marketplace-metadata/marketplace.xml conforms to pentaho code style
[CLEANUP] fixed generation of marketplace entry
[CLEANUP] the marketplace metadata generated by the build process includes a <max_parent_version> tag
[CLEANUP]: missing properties for marketplace.xml
[REDMINE-3233] - Content type in home call for Pentaho 5
Changelog for 14.10.15
Changelog for 14.10.15