Merge "BUG-832 Add initial configuration for controller self mount"