[KFSQA-865] Changes made for new Cynergy UI. Probably Cornell only
[KFSQA-865] merge from master for cynergy UI change