master-bc-417

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