Merge in latest from master branch into topic branch for WTD-1272 Conflicts: platform/forms/test/controllers/DateTimeControllerSpec.js
Merge in latest from master branch into topic branch for WTD-1272 Conflicts: platform/forms/test/controllers/DateTimeControllerSpec.js