Fix for Bug NMS-6020 (Adding OnmsBeanContainer)

PLEASE DO NOT ATTEMPT TO MERGE THIS WITH MASTER.
some changes to support using artifacts for RPM builds
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge branch '1.12'