CA-148495: secure build.
CA-148495: include recent changes.
CA-148495: Merge remote-tracking branch 'creedence/master'.
CA-152017 : Fixed by channging the position for ZHCN.
CA-147666 : Fixed the issue by changing the location for ZHCN
CA-147716: Fixed by updating the HOtKeys for JA and ZHCN
CA-152020: Fixed by updating the translations for JA and ZHCN
CA-147668: Issue fixed by updating the padding in ZHCN
CA-147663: Issue fixed by changing the dimensions ,location and hotkeys for JA and ZHCN
CA-150021: Fixed the issue by changing the positions for JA
CA-150935: Fixed by adjusting the size for JA
CA-152087: Fixed by changing the positions for JA.
CA-152018: Fixed by adjusting the dimensions for ZHCN
CA-151648: Fixed the issue by changing the dimensions for JA
CA-150219: Fixed by removing the unnecessary fields for JA and ZHCN
CA-147731: Fixed by increasing the size for JA and ZHCN
CA-149815: Fixed by adjusting the table layout for ZHCn
CA-148876  CA-150934  CA-149873 Fixes
CA-150462 : Fixed the issue by updating the translations for ZHCN
CA-150463: Fixed the issue by adjusting the layout for JA