Merge "Revert "Fix for appc clustering install failure""