Changes to Parent PI rules.
Updated rule for Parent PI for DSC-465
Merge branch 'master' of https://github.com/nla/banjo
Merge branch 'master' into ti_parent_pi_rule_change
Change if/else conditions into switch.
DSC-460 'Holdings', 'Internal Access Condition' and 'Availability to Public' fields are updated as per requirement
Merge branch 'bs-dsc-460-work'
Merge pull request #590 from nla/ti_parent_pi_rule_change

Parent pi rule change, merged.
DSC-449 notes deleted from devices & software drop-down
Merge branch 'master' of github.com:nla/banjo
Merge branch 'bs-dsc-449-del-notes'
ensure jobName is set on new jobs
Merge pull request #594 from nla/js-bugfix

ensure jobName is set on new jobs, merged.
Merge pull request #592 from nla/bs-dsc-460-work

DSC-460 'Holdings', 'Internal Access Condition' and 'Availability to Pub...
Merge pull request #593 from nla/bs-dsc-449-del-notes

Bs dsc 449 del notes
Merge branch 'master' of github.com:nla/banjo
DSC-393 oustanding issues with carrier capacity, speed and duration are fixed
Merge pull request #595 from nla/bs-dsc-393-duration-issues

Bs dsc 393 duration issues
Merge branch 'bug/acm-DSC-75' of https://github.com/nla/banjo into bug/acm-DSC-75

This reverts commit 4605596c311dd0a7944352d45a208e0525bc92bf.

Conflicts:
	web/WEB-INF/views/works/form.ftl