master-qa-5060

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