NYX - merge master/scans-ophyd-bluesky code

Merge in LSDC code and configs from master+scans-ophyd-bluesky as soon as possible. This will allow use of the latest features, will also require the latest conda envs.

Due to time issues, this was not able to do before Day 1 with Users on February 10, 2022.

If necessary, add further sub-issues such as merging configs, adding conda envs (GUI and server)