Committing the following changes:
- Cloud Foundry integration configs
- Minor bug fixes