Merge pull request #6 from wso2-dev/master

Merge parent and features pom.xml changes from 3.5.0 branch to trunk
Merge pull request #7 from wso2-dev/master

* Fixed TOOLS-2367.
Merge pull request #1 from wso2/master

Lates_update_25042014