Merging from areaDetector:master

Importing latest changes from master branch
https://github.com/areaDetector/ADCore/commit/8121e627f349a821426c5b10d7a5d66995e7322
https://github.com/areaDetector/ADCore/commit/241a8f2ae1a9fd5b74b3b404736651f76f6a04c
https://github.com/areaDetector/ADCore/commit/e114e4e92cf4a4b2b20aeb0f3a0363bfa8ac322
https://github.com/areaDetector/ADCore/commit/50633a758f644529eaabf79a43e2f099a855995
https://github.com/areaDetector/ADCore/commit/458ce4003fb352c3612a323f3a1cb07d2a96bae
https://github.com/areaDetector/ADCore/commit/203abc34e0b1ed46d79305051946c12c540bf7d
https://github.com/areaDetector/ADCore/commit/fd6016df98a6e5bc24ab07d758d06a6499a8f77
https://github.com/areaDetector/ADCore/commit/9292b0736a645fc1562d0034b063ded74cfcd1a
https://github.com/areaDetector/ADCore/commit/550ebad565477ad748a1905ac7904db17645d91
https://github.com/areaDetector/ADCore/commit/4fae5850186573cd8d25d7c32876bde954c3f370fcec13c9b
https://github.com/areaDetector/ADCore/commit/c504006349370ba8491da95fdc0dba98ab2fb661