Ambari-587 snafu

[Vikram Dixit]

Hi Folks,

Ambari 587 commit has caused some issues as the patch has created some garbling 
in some files. I am working on fixing it. There may be some renames and/or 
moves, so hang tight! I will send out an email once it is fixed.

Regards,
Vikram