master-qa-5706

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