master-qa-12517

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