master-qa-12403

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