More Centos Fixes

Various fixes to make the controller installation work on Centos

Closes-Bug: 1241310

Change-Id: I1aad1fe80c00c892adac189e4e6d226084dff63e
Merge "More Centos Fixes"