Merge pull request #26 from mancdaz/swift

Merged automatically by jenkins after successful build test
[TA36] - ensure ha-controller* and ha-swift-controller* roles can co-exist