Merged revision 8181 from branches/JAFFA_5_21_1...
Merged revision 8181 from branches/JAFFA_5_21_1...
JAFFA-280: add fix to array index out of bound ...
JAFFA-241: use JSON to create StartMenu in Find...
Manually merged from 5_20 release branch.
Append px to numbers to conform to the standards.
conform to the standard: adding px after the pi...
Conforming to the standard: add px after the nu...