master-bc-473

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