master-bc-407

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