Changes for Fixes to make the BO accepts Site name

https://catissueplus.atlassian.net/browse/PLUS-655
https://catissueplus.atlassian.net/browse/PLUS-982
https://catissueplus.atlassian.net/browse/PLUS-987
https://catissueplus.atlassian.net/browse/PLUS-984