master-bc-350

http://issues.liferay.com/browse/LIFERAYQA-3636
http://issues.liferay.com/browse/LIFERAYQA-3637
http://issues.liferay.com/browse/LIFERAYQA-3632