Merge remote-tracking branch 'refs/remotes/kylestiemann/FACES-1484' into 3.1.x
FACES-1491
several liferay-portlet.xml includes unnecessary <instanceable> tag which does not follow liferay convention
Merge remote-tracking branch 'refs/remotes/kylestiemann/FACES-1477' into 3.1.x