fixed custommenu php fatal error re: empty()
Merge branch '2.6/feature/custom-menu-permissions' into 2.6/integration