master-qa-12529

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