Need to alias system bundle capabilities and other minor refactoring of system bundle capability handling. (FELIX-2950)