Fix for issue #20 and removed apigee related files and prop entry in xml file