master-qa-7630

http://issues.liferay.com/browse/LIFERAYQA-7630