Explicitly cast shared_ptr to bool for C++11 compatibility
Eliminate compiler warning about logical not only applying to lhs of expr.
Change member variable from reference to shared_ptr to shared_ptr

Using a reference was causing serious problems in C++11 and was totally unnecessary.
Minor change struct->class to eliminate compiler warning
Merge branch 'tickets/DM-1302'
Merge branch 'master' into u/pgee/DM-1608
Reverse incorrect changes to previous commits