resolved conflicts for merge of a8a05585 to master
resolved conflicts for merge of a8a05585 to master

Change-Id: I787b92631eb71f9a56e36739f7ad61133f10fa2a

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