updates for reordered cfoundry error args

Change-Id: Ia54e988a2da3e2d7742af954bf863d22b7eadcd5
fix indentation of changes display

Change-Id: I3c60ff5512801ba03fa397f229a42440823f6826
Merge "updates for reordered cfoundry error args"
Merge "fix indentation of changes display"