master-bc-400

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