merge from master
Build latest ozp-iwc
Strip hostname and base path from resource keys
merge from master