master-qa-12273

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