Merge branch 'master' into DRTVWR-518-ui

autobuild.xml

doc/contributions.txt

indra/llcommon/llapp.cpp

indra/llcommon/llapr.cpp

indra/llcommon/llcleanup.cpp

indra/llcommon/llcleanup.h

indra/llcommon/llcommon.cpp

indra/llcommon/llerror.cpp

indra/llcommon/llerrorcontrol.h

indra/llcommon/llsingleton.cpp

indra/llinventory/llinventory.cpp

indra/llinventory/llinventory.h

indra/llinventory/llinventorysettings.cpp

indra/llinventory/llinventorysettings.h

indra/llinventory/llpermissions.cpp

indra/llinventory/llpermissions.h

indra/llinventory/llsaleinfo.cpp

indra/llinventory/llsaleinfo.h

indra/llinventory/llsettingsbase.h

indra/llinventory/tests/inventorymisc_test.cpp