Merging oo/am updates into WHOGit and WFP_cals#955

reedan88 merged 4 commits intoWFP_calsWHOIGit/ooicgsn-asset-management:WFP_calsfrom

masterWHOIGit/ooicgsn-asset-management:masterCopy head branch name to clipboard