Merge into develop correctly

Signed-off-by: Adam Stegman <astegman@pivotal.io>
Update box version to 368