Merge pull request #100 from sraaphorst/feature/OCSADV-170

OCSADV-170
Merge branch 'bugfix/REL-2100' into develop
Merge branch 'bugfix/REL-2113' into develop
OCSADV-191: cleanup
Merge pull request #102 from swalker2m/feature/OCSADV-191-B

OCSADV-191: cleanup probe limits parsing
REL-2121: NPE in TPE offset feature unload
Merge branch 'feature/REL-2121' into develop
OCSADV-29: a bit of cleanup
OCSADV-29: combined AgsSeverity and AgsGuideQuality. simplified GuidingFeedback a bit
OCSADV-29: added feedback on selected target, as requested
Merge branch 'bugfix/OCSADV-29' into develop
moved Im* ~ Scala converters to shared.util, left stub behind
added parse(File) overload
small program to tally up stats about targets
Merge pull request #110 from tpolecat/feature/OCSADV-154-analysis

OCSADV-154 target analysis
policy/trpcclient fix for locked keychain
Merge pull request #99 from tpolecat/bugfix/REL-2099

REL-2099: policy/trpcclient fix for locked keychain
Merge pull request #103 from tpolecat/bugfix/REL-2105

REL-2105 keychain actions in QPT
REL-2097: updated GPI template to set aquisition observation class correctly
Merge pull request #117 from swalker2m/bugfix/REL-2097

REL-2097: updated GPI template to set acquisition observation class