[DS-951] Refactor PropLoader to Property for acceptance tests
Removing extraneous characters in rake task
Adding new cert to ciKeyStore.jks
Append time to cats_with_lasers for acceptance tests
Merge branch 'master' into ssl_error

Conflicts:
	sli/data-access/dal/keyStore/ciKeyStore.jks