resolved conflicts for merge of ad93c622 to master
resolved conflicts for merge of ad93c622 to master

Change-Id: I81dc207aa90a96cc46c8a929d745e9aefb0ad802

treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst