master-bc-1707

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