This corrects issues that arose after OAM reorganization. It should address SWDEV-243294. Also, fix some compile warnings that show up on RHEL. Change-Id: Id14d444905da35cd7346bcfbcd82b6d0572708c4
Chris Freehill