Merge pull request #1081 from mdamour1976/master

BISERVER-10699 Lost functionality from 4.8 -> 5.0: Need alternative way of customizing startup behavior and settings to PUC
BISERVER-10154 - File|Open in PUC can take an unreasonable amount of time
Merge pull request #1082 from jeffreythomas/dev

BISERVER-10154 - File|Open in PUC can take an unreasonable amount of tim...