master-qa-5815

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