Merge "Allow deployment on Centos 6.5 environment"