CB-4786 adding owner and checking in some spec requirements
...and fixing conflict