Fixed bug that caused global roles to override locally set roles when merging grants in ObjectAccessControlsBean.  Added additional tests.  View Only tag no longer displays if the user has both observer and a higher admin right on the same object.  Correctly checking for empty AddMenu item list