Disable homestead provisioning API in C3E
Switch to using a features directory rather than a file
Fix bug in init.d scripts
Set LOCAL_PROVISIONING_ENABLED to True by default so the UTs work
Merge remote-tracking branch 'origin/master' into sto552
Merge pull request #124 from Metaswitch/sto552

[Reviewer: Rob] Sto552
Remove hanging conflict marker
Merge pull request #128 from Metaswitch/sto552

Remove hanging conflict marker