master-qa-3022

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