Bug 1731: Breaking dependency cycle between features-{mdsal,aaa}

This is the follow up to integration for:
https://git.opendaylight.org/gerrit/#/c/10878/

Change-Id: I89fa9d92641886d552eeeb39f7252946ddb2b3e6
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Merge "Bug 1731: Breaking dependency cycle between features-{mdsal,aaa}"