Removed merge_cline - no longer required
Added the last pieces of vpc guest network
password server and associated FW rules
Added apache2 config and start of server
Corrected a bug in CsFile
Fixed some of the many pyLint bleats
Merge branch 'feature/systemvm-persistent-config' of github.com:schubergphilis/cloudstack into feature/systemvm-persistent-config