master-qa-6190

http://issues.liferay.com/browse/LIFEERAYQA-6190