[LIB_HUBZERO] handle more generically
[LIB_HUBZERO] handle more generically

zweidner/hubzero-cms,zweidner/hubzero-cms,anthonyfuentes/hubzero-cms,anthonyfuentes/hubzero-cms,zweidner/hubzero-cms,zooley/hubzero-cms,zooley/hubzero-cms,anthonyfuentes/hubzero-cms,zooley/hubzero-cms,anthonyfuentes/hubzero-cms,zooley/hubzero-cms,zweidner/hubzero-cms