FIx some merge errors
Fixed more merge error
Fix missing variables in localrc
Fixed error preventing adding glance user