Fix styling for change notes/save and save and continue in admin

• shift padding and border on elements so that save and save and
continue buttons look ok without change notes being present

https://www.pivotaltracker.com/story/show/59861216
Merge commit 'cb2502518dac8d27c7e69fae2480a7d54e294bf6' into HEAD