LPS-35246 && LPS-35224 - Navigation Add/Delete Pages broken

http://issues.liferay.com/browse/LPS-35224