HEAD-1158 Bugfixes after test import of JPC data
HEAD-1158 Bugfixes after test import of JPC data

kaizengarden/sdc-headnode,joyent/sdc-headnode,numericillustration/sdc-headnode,numericillustration/sdc-headnode,kaizengarden/sdc-headnode,joyent/sdc-headnode,kaizengarden/sdc-headnode,numericillustration/sdc-headnode,kaizengarden/sdc-headnode,joyent/sdc-headnode,joyent/sdc-headnode