Updated builders for effective time frames, bumped version on omh-shims.
Quick fix for detecting reloads after authorizations.
Merge remote-tracking branch 'origin/unit-test-upgrades' into unit-test-upgrades

Conflicts:
	shim-server/pom.xml